merge with xen-unstable.hg (staging)

diff --cc xen/arch/ia64/xen/domain.c
index c8cd84a74b68c90006cef05226df3559fa45dadc,e9d1d3103b5f0b5a00fab47b75a217b301ff7a75..eb5bc68448d0165ee20c96550022a5ac17ad8347
--- 1/xen/arch/ia64/xen/domain.c
--- 2/xen/arch/ia64/xen/domain.c
+++ b/xen/arch/ia64/xen/domain.c
@@@ -936,10 -937,11 +937,11 @@@ static void relinquish_memory(struct do
      spin_unlock_recursive(&d->page_alloc_lock);
  }
  
- void domain_relinquish_resources(struct domain *d)
+ int domain_relinquish_resources(struct domain *d)
  {
+     int ret;
      /* Relinquish guest resources for VT-i domain. */
 -    if (d->vcpu[0] && VMX_DOMAIN(d->vcpu[0]))
 +    if (d->arch.is_vti)
            vmx_relinquish_guest_resources(d);
  
      /* Tear down shadow mode stuff. */

diff --cc xen/arch/ia64/xen/mm.c
Simple merge

diff --cc xen/arch/ia64/xen/xensetup.c
Simple merge